From: Heiher <r@hev.cc>
Date: Wed, 22 Jan 2014 02:39:52 +0000 (+0800)
Subject: modalDialog: Fix invalid argument 'timestamp' for pushModal
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~884
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a23b293fe2d1b0bb4921ef63b62a19672e98b833;p=gnome-shell.git

modalDialog: Fix invalid argument 'timestamp' for pushModal

https://bugzilla.gnome.org/show_bug.cgi?id=722752
---

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 960e0dca3..ac773056d 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
         if (this.state == State.OPENED || this.state == State.OPENING)
             return true;
 
-        if (!this.pushModal({ timestamp: timestamp }))
+        if (!this.pushModal(timestamp))
             return false;
 
         this._fadeOpen(onPrimary);
@@ -318,8 +318,11 @@ const ModalDialog = new Lang.Class({
     pushModal: function (timestamp) {
         if (this._hasModal)
             return true;
-        if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           actionMode: this._actionMode }))
+
+        let params = { actionMode: this._actionMode };
+        if (timestamp)
+            params['timestamp'] = timestamp;
+        if (!Main.pushModal(this._group, params))
             return false;
 
         this._hasModal = true;